emacs.git
3 weeks agoBoost BASE_PURESIZE in attempt to fix build on 32-bit archs
Sean Whitton [Tue, 25 Feb 2025 01:19:38 +0000 (09:19 +0800)]
Boost BASE_PURESIZE in attempt to fix build on 32-bit archs

Gbp-Pq: Name 0019-Boost-BASE_PURESIZE-in-attempt-to-fix-build-on-32-bi.patch

3 weeks agoFix eldoc warning in patch adding debian-emacs-flavor
Xiyue Deng [Tue, 28 Jan 2025 07:23:37 +0000 (23:23 -0800)]
Fix eldoc warning in patch adding debian-emacs-flavor

Forwarded: not-needed
Closes: #1095133
Gbp-Pq: Name 0018-Fix-eldoc-warning-in-patch-adding-debian-emacs-flavo.patch

3 weeks agoMark dired-test-bug27243-02 as unstable for now
Rob Browning [Sat, 29 Jun 2024 16:01:56 +0000 (11:01 -0500)]
Mark dired-test-bug27243-02 as unstable for now

This appears to be a known issue:

  https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27243#64
  https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27243#115

Sample failure:

  Test dired-test-bug27243-02 backtrace:
    signal(ert-test-failed (((should (eq (point) pt1)) :form (eq 176 179
    ert-fail(((should (eq (point) pt1)) :form (eq 176 179) :value nil))
    #f(compiled-function () #<bytecode -0xdd3f9b8b64b2928>)()
    ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test
    ert-run-test(#s(ert-test :name dired-test-bug27243-02 :documentation
    ert-run-or-rerun-test(#s(ert--stats :selector (not ...) :tests [...
    ert-run-tests((not (or (tag :expensive-test) (tag :unstable))) #f(co
    ert-run-tests-batch((not (or (tag :expensive-test) (tag :unstable)))
    ert-run-tests-batch-and-exit((not (or (tag :expensive-test) (tag :un
    command-line-1(("-L" ":/<<PKGBUILDDIR>>/debian/
    command-line()
    normal-top-level()
  Test dired-test-bug27243-02 condition:
      (ert-test-failed
       ((should
         (eq
          (point)
          pt1))
        :form
        (eq 176 179)
        :value nil))
     FAILED   5/16  dired-test-bug27243-02 (0.010115 sec) at ../../build-src/test/lisp/dired-tests.el:189

Bug: https://debbugs.gnu.org/27243
Forwarded: not-needed

Gbp-Pq: Name 0017-Mark-dired-test-bug27243-02-as-unstable-for-now.patch

3 weeks agoChange native-comp-async-report-warnings-errors to silent
Sean Whitton [Thu, 28 Mar 2024 05:24:49 +0000 (13:24 +0800)]
Change native-comp-async-report-warnings-errors to silent

We have had numerous bug reports across packages about this bothering
users.

Gbp-Pq: Name 0016-Change-native-comp-async-report-warnings-errors-to-s.patch

3 weeks agoChange native-comp-async-jobs-number default to 1
Sean Whitton [Tue, 29 Aug 2023 08:08:55 +0000 (09:08 +0100)]
Change native-comp-async-jobs-number default to 1

Gbp-Pq: Name 0015-Change-native-comp-async-jobs-number-default-to-1.patch

3 weeks agoPatch project-vc-recognizes-git test for Debian build
Sean Whitton [Mon, 31 Jul 2023 08:26:48 +0000 (09:26 +0100)]
Patch project-vc-recognizes-git test for Debian build

Gbp-Pq: Name 0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch

3 weeks agoRename to 'inhibit-automatic-native-compilation'
Lars Ingebrigtsen [Mon, 3 Oct 2022 17:49:53 +0000 (19:49 +0200)]
Rename to 'inhibit-automatic-native-compilation'

The following upstream patch has been backported:

  Rename to inhibit-automatic-native-compilation

  * src/comp.c (maybe_defer_native_compilation):
  (syms_of_comp):
  * lisp/startup.el (inhibit-native-compilation):
  (normal-top-level):
  * lisp/progmodes/elisp-mode.el (emacs-lisp-native-compile-and-load):
  * lisp/emacs-lisp/comp.el (comp-trampoline-compile): Rename
  inhibit-native-compilation to inhibit-automatic-native-compilation.

Origin: upstream, commit f97993ee667f9be7589825f3a4fbc095d6944ec6
Forwarded: not-needed

Gbp-Pq: Name 0013-Rename-to-inhibit-automatic-native-compilation.patch

3 weeks agoAdd 'inhibit-native-compilation'
Lars Ingebrigtsen [Mon, 3 Oct 2022 13:26:04 +0000 (15:26 +0200)]
Add 'inhibit-native-compilation'

The following upstream patch has been backported:

  Add new variable 'inhibit-native-compilation'

  * lisp/startup.el (normal-top-level): Set
  inhibit-native-compilation from environment variable.

  * lisp/emacs-lisp/comp.el (comp-trampoline-compile): Don't write
  trampolines to disk.

  * lisp/progmodes/elisp-mode.el
  (emacs-lisp-native-compile-and-load): Adjust.

  * src/comp.c (syms_of_comp): New variable
  inhibit-native-compilation.
  (maybe_defer_native_compilation): Use it.

Origin: upstream, commit: 5fec9182dbeffa88cef6651d8c798ef9665d6681
Forwarded: not-needed

Gbp-Pq: Name 0012-Add-inhibit-native-compilation.patch

3 weeks agoMark flaky test process-tests/multiple-threads-waiting as unstable
Sean Whitton [Tue, 15 Nov 2022 23:26:59 +0000 (16:26 -0700)]
Mark flaky test process-tests/multiple-threads-waiting as unstable

It times out:

     passed  22/28  process-tests/fd-setsize-no-crash/make-serial-process (0.021449 sec)
  make[5]: *** [Makefile:182: src/process-tests.log] Error 134
    GEN      src/regex-emacs-tests.log
    GEN      src/search-tests.log
    GEN      src/syntax-tests.log
    GEN      src/textprop-tests.log
    GEN      src/thread-tests.log
    GEN      src/timefns-tests.log
    GEN      src/undo-tests.log
    GEN      src/xdisp-tests.log
    GEN      src/xfaces-tests.log
    GEN      src/xml-tests.log
  make[5]: Leaving directory '/<<PKGBUILDDIR>>/debian/build-gtk/test'
  make[4]: [Makefile:335: check-doit] Error 2 (ignored)

  SUMMARY OF TEST RESULTS
  -----------------------
  Files examined: 375
  Ran 5408 tests, 28 failed to run, 5273 results as expected, 0 unexpected, 135 skipped
  1 files did not finish:
    src/process-tests.log
  make[4]: *** [Makefile:336: check-doit] Error 2

Gbp-Pq: Name 0011-Mark-flaky-test-process-tests-multiple-threads-waiti.patch

3 weeks agoMark test-undo-region as unstable
Sean Whitton [Tue, 15 Nov 2022 22:54:41 +0000 (15:54 -0700)]
Mark test-undo-region as unstable

It is repeatedly failing on Debian's arch:all autobuilders, though
seemingly nowhere else:

     passed  40/44  simple-transpose-subr (0.000396 sec)
  Test test-undo-region backtrace:
    signal(ert-test-failed (((should (= (length (delq nil (undo-make-sel
    ert-fail(((should (= (length (delq nil (undo-make-selective-list 1 9
    #f(compiled-function () #<bytecode 0x52f126616d2cdbd>)()
    ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test
    ert-run-test(#s(ert-test :name test-undo-region :documentation nil :
    ert-run-or-rerun-test(#s(ert--stats :selector ... :tests ... :test-m
    ert-run-tests((not (or (tag :expensive-test) (tag :unstable))) #f(co
    ert-run-tests-batch((not (or (tag :expensive-test) (tag :unstable)))
    ert-run-tests-batch-and-exit((not (or (tag :expensive-test) (tag :un
    command-line-1(("-L" ":/<<PKGBUILDDIR>>/debian/build
    command-line()
    normal-top-level()
  Test test-undo-region condition:
      (ert-test-failed
       ((should
         (=
   (length ...)
   2))
        :form
        (= 3 2)
        :value nil))
     FAILED  41/44  test-undo-region (0.000185 sec)

Gbp-Pq: Name 0010-Mark-test-undo-region-as-unstable.patch

3 weeks agopdumper: set DUMP_RELOC_ALIGNMENT_BITS=1 for m68k
John Paul Adrian Glaubitz [Sat, 24 Sep 2022 18:37:18 +0000 (13:37 -0500)]
pdumper: set DUMP_RELOC_ALIGNMENT_BITS=1 for m68k

Before the change builds would fail like this:

  (...)
  Loading /<<BUILDDIR>>/emacs-27.1+1/debian/build-src/lisp/vc/vc-hooks.el (source)...
  Loading /<<BUILDDIR>>/emacs-27.1+1/debian/build-src/lisp/vc/ediff-hook.el (source)...
  Loading /<<BUILDDIR>>/emacs-27.1+1/debian/build-src/lisp/uniquify.el (source)...
  Loading /<<BUILDDIR>>/emacs-27.1+1/debian/build-src/lisp/electric.el (source)...
  Loading /<<BUILDDIR>>/emacs-27.1+1/debian/build-src/lisp/emacs-lisp/eldoc.el (source)...
  Loading /<<BUILDDIR>>/emacs-27.1+1/debian/build-src/lisp/cus-start.el (source)...
  Loading /<<BUILDDIR>>/emacs-27.1+1/debian/build-src/lisp/tooltip.el (source)...
  Finding pointers to doc strings...
  Finding pointers to doc strings...done
  Dumping under the name bootstrap-emacs.pdmp
  dumping fingerprint: 7b5c59c589dc151eb1e4269bd83fbe809616b5cb9bb5c80014d5b560b391dfb6
  dump relocation out of range

[rlb@defaultvalue.org: create commit message]

Origin: debian
Bug: https://bugs.gnu.org/44531
Bug-Debian: http://bugs.debian.org/1019130
Forwarded: not-needed

Gbp-Pq: Name 0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch

3 weeks agoMark vc-bzr-test-fauilt-bzr-autoloads as unstable for now
Rob Browning [Sun, 16 Dec 2018 23:13:36 +0000 (17:13 -0600)]
Mark vc-bzr-test-fauilt-bzr-autoloads as unstable for now

Currently the test fails like this:

  Running 3 tests (2018-12-17 12:17:43-0600)
     passed  1/3  vc-bzr-test-bug9726
  Mark set
  Press C-c C-c when you are done editing.
  Enter a change comment.  Type C-c C-c when done
     passed  2/3  vc-bzr-test-bug9781
  Falling back on "slow" status detection ((file-missing "Opening input file" "No such file or directory" "/tmp/vc-bzr-testVlgmsb/bzr/.bzr/checkout/dirstate"))
  Error: (error "Running bzr status --no-classify loaddefs.el...FAILED (status 3)")
  Warnings in `bzr' output: bzr: ERROR: invalid header line: ''

  Error: (error "Running bzr status --no-classify loaddefs.el...FAILED (status 3)")
  Warnings in `bzr' output: bzr: ERROR: invalid header line: ''

  Test vc-bzr-test-faulty-bzr-autoloads backtrace:
    logand(nil 128)
    vc-mode-line("/tmp/vc-bzr-testVlgmsb/bzr/loaddefs.el" Bzr)
    vc-refresh-state()
    run-hooks(find-file-hook)
    after-find-file(t t)
    find-file-noselect-1(#<buffer loaddefs.el> "/tmp/vc-bzr-testVlgmsb/b
    find-file-noselect("/tmp/vc-bzr-testVlgmsb/bzr/loaddefs.el")
    autoload-find-generated-file()
    update-directory-autoloads("/tmp/vc-bzr-testVlgmsb/bzr/")
    (progn (update-directory-autoloads default-directory) t)
    (setq value-35 (progn (update-directory-autoloads default-directory)
    (unwind-protect (setq value-35 (progn (update-directory-autoloads de
    (if (unwind-protect (setq value-35 (progn (update-directory-autoload
    (let (form-description-36) (if (unwind-protect (setq value-35 (progn
    (let ((value-35 (gensym "ert-form-evaluation-aborted-"))) (let (form
    (progn (call-process vc-bzr-program nil nil nil "init") (let ((temp-
    (unwind-protect (progn (call-process vc-bzr-program nil nil nil "ini
    (let* ((homedir (make-temp-file "vc-bzr-test" t)) (bzrdir (expand-fi
    (lambda nil (let* ((fn-30 (function executable-find)) (args-31 (cond
    ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test
    ert-run-test(#s(ert-test :name vc-bzr-test-faulty-bzr-autoloads :doc
    ert-run-or-rerun-test(#s(ert--stats :selector (not (or (tag :expensi
    ert-run-tests((not (or (tag :expensive-test) (tag :unstable))) #f(co
    ert-run-tests-batch((not (or (tag :expensive-test) (tag :unstable)))
    ert-run-tests-batch-and-exit((not (or (tag :expensive-test) (tag :un
    eval((ert-run-tests-batch-and-exit '(not (or (tag :expensive-test) (
    command-line-1(("-L" ":/home/locke/tmp/main-26.1/debian/build-src/te
    command-line()
    normal-top-level()
  Test vc-bzr-test-faulty-bzr-autoloads condition:
      (wrong-type-argument number-or-marker-p nil)
     FAILED  3/3  vc-bzr-test-faulty-bzr-autoloads

  Ran 3 tests, 2 results as expected, 1 unexpected (2018-12-17 12:17:46-0600)

  1 unexpected results:
     FAILED  vc-bzr-test-faulty-bzr-autoloads

Gbp-Pq: Name 0008-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch

3 weeks agoKill gpg agent in package-test.el to avoid a race
Rob Browning [Mon, 10 Oct 2016 22:35:56 +0000 (17:35 -0500)]
Kill gpg agent in package-test.el to avoid a race

package-test.el should no longer fail during clean up.

* Previously a delete-directories call raced with the gpg agent's own
  cleanup process (presumably triggered by the first deletion of one of
  the agent's sockets).  As a result, it looks like the agent might
  delete one of its sockets after delete-directories had decided to
  delete the socket, but before it made the attempt, causing an
  exception.

* To fix the problem, explicitly ask gpg-connect-agent to kill the agent
  before attempting to delete the gnupg home directory, and then delete
  via "rm -rf" to ignore any vanishing files.

Gbp-Pq: Name 0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch

3 weeks agoDon't try to build src/macuvs.h (via IVD_Sequences.txt)
Rob Browning [Wed, 22 Oct 2014 00:10:17 +0000 (19:10 -0500)]
Don't try to build src/macuvs.h (via IVD_Sequences.txt)

These are OS X specific, and were removed for now, due to uncertainty
over the licensing.

Gbp-Pq: Name 0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch

3 weeks agoModify the output of (version) to indicate Debian modifications
Rob Browning [Tue, 5 Apr 2011 03:46:28 +0000 (22:46 -0500)]
Modify the output of (version) to indicate Debian modifications

The output of (version) has been modified to indicate Debian modifications.

Author: Rob Browning <rlb@defaultvalue.org>
Added-by: Rob Browning <rlb@defaultvalue.org>
Gbp-Pq: Name 0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch

3 weeks agoAdjust documentation references for Debian
Rob Browning [Tue, 5 Apr 2011 03:46:25 +0000 (22:46 -0500)]
Adjust documentation references for Debian

Various documentation references have been adjusted for Debian.

References to /usr/local/... have been changed to /usr/... as
appropriate, etc.

Gbp-Pq: Name 0004-Adjust-documentation-references-for-Debian.patch

3 weeks agoRemove files that appear to be incompatible with the DFSG
Rob Browning [Tue, 5 Apr 2011 03:46:24 +0000 (22:46 -0500)]
Remove files that appear to be incompatible with the DFSG

Files that appear to be incompatible with the DFSG have been removed.

A number of files have been removed from this package because their
licenses are not compatible with the Debian Free Software Guidelines
(DFSG), or because it wasn't completely clear that their licenses are
compatible.

In particular, all of the files which are covered under the GFDL and
have invariant sections have been removed in accordance with this
General Resolution: http://www.debian.org/vote/2006/vote_001.

The files that have been removed, but still appear to be
distributable, have been moved to packages in Debian's non-free
section.

Author: Rob Browning <rlb@defaultvalue.org>
Added-by: Rob Browning <rlb@defaultvalue.org>
Status: new

Gbp-Pq: Name 0003-Remove-files-that-appear-to-be-incompatible-with-the.patch

3 weeks agoRun debian-startup and set debian-emacs-flavor
Rob Browning [Tue, 5 Apr 2011 03:46:22 +0000 (22:46 -0500)]
Run debian-startup and set debian-emacs-flavor

Emacs runs debian-startup and sets debian-emacs-flavor.

* Emacs runs debian-startup during the startup process unless
  site-run-file is false.

* The global variable debian-emacs-flavor is bound to 'emacs.

Author: Rob Browning <rlb@defaultvalue.org>

Gbp-Pq: Name 0002-Run-debian-startup-and-set-debian-emacs-flavor.patch

3 weeks agoPrefer /usr/share/info/emacs/
Rob Browning [Sun, 7 Apr 2013 20:03:05 +0000 (15:03 -0500)]
Prefer /usr/share/info/emacs/

Emacs prefers /usr/share/info/emacs to /usr/share/info.

The value of Info-default-directory-list has been augmented via
lisp/info.el to include /usr/share/info/emacs before /usr/share/info.

Gbp-Pq: Name 0001-Prefer-usr-share-info-emacs.patch

3 weeks agoemacs (1:30.1+1-6+deb13u1) trixie-security; urgency=high
Rob Browning [Fri, 21 Aug 2026 17:24:00 +0000 (12:24 -0500)]
emacs (1:30.1+1-6+deb13u1) trixie-security; urgency=high

  * Mark esh-proc-test/kill-pipeline as unstable for now.  Skip it since
    it fails sporadically on at least s390x.  Add
    0024-Mark-esh-proc-test-kill-pipeline-as-unstable-for-now.patch to
    address the issue.

  * Fix an SVG-related vulnerability (CVE-2026-6861).  Add
    0025-src-image.c-svg_load_image-Fix-off-by-one-mistake-bu.patch which
    includes the upstream patch to fix the problem.  Thanks to Salvatore
    Bonaccorso for reporting the issue. (Closes: 1134692)

  * Don't run bytecomp-tests--dest-mountpoint where bwrap doesn't work.
    Add 0026-bytecomp-tests-dest-mountpoint-only-run-test-if-bwra.patch to
    address the issue.  Thanks to Santiago Vila for reporting the
    issue. (Closes: 1129189)

  * Skip two more proced-tests in debian that are skipped on darwin to
    avoid hanging during the tests.  Add
    0025-Skip-some-proced-tests-that-appear-to-be-hanging.patch to address
    the issue.

  * Mitigate a risk of executing arbitrary code when opening a file.  The
    vulnerability that has been mitigated could allow a specially crafted
    file to trigger execution of arbitrary Emacs Lisp code immediately
    upon visiting it in Emacs.  The broader issue is described here:
    https://debbugs.gnu.org/80574

    Add 0030-Mitigate-arbitrary-code-execution-vulnerability.patch to
    include the upstream patch addressing the problem.  Thanks to Nicholas
    D Steeves for reporting the issue.

[dgit import unpatched emacs 1:30.1+1-6+deb13u1]

3 weeks agoImport emacs_30.1+1-6+deb13u1.debian.tar.xz
Rob Browning [Fri, 21 Aug 2026 17:24:00 +0000 (12:24 -0500)]
Import emacs_30.1+1-6+deb13u1.debian.tar.xz

[dgit import tarball emacs 1:30.1+1-6+deb13u1 emacs_30.1+1-6+deb13u1.debian.tar.xz]

18 months agoImport emacs_30.1+1.orig.tar.xz
Sean Whitton [Mon, 24 Feb 2025 09:19:10 +0000 (17:19 +0800)]
Import emacs_30.1+1.orig.tar.xz

[dgit import orig emacs_30.1+1.orig.tar.xz]